Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Tue, 6 Apr 2010 20:57:22 +0000 (22:57 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Tue, 6 Apr 2010 20:57:22 +0000 (22:57 +0200)
commit9ea5a239fee7ba51dfae5e7539c1b007afba1e4d
tree9bcd3039b158a8117fb4ec585f00ee1704297e1e
parent4d21a068016bdd4445be38008e6fb3e655d9f458
parent019b90fa7f0a4b5f4edb58a39a19d412d3aa7ef6
Merge branch 'upstream'